Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 29 Oct 2011 17:26:38 +0000 (10:26 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 29 Oct 2011 17:26:38 +0000 (10:26 -0700)
commit77ec94b0c228f3379eeb6b08287de79ece465240
treec9cd3eb7de2f2bbc2db835d8cfe3694101647f75
parent1c70e8b8e8062c7a3f857ca8dea9b7112cdec1e6
parent32306041f15f8740471fc22a4de733e814034122
Merge from trunk.